Merge git://git.denx.de/u-boot-x86
authorTom Rini <[email protected]>
Wed, 5 Aug 2015 18:12:37 +0000 (14:12 -0400)
committerTom Rini <[email protected]>
Wed, 5 Aug 2015 18:12:37 +0000 (14:12 -0400)

Trivial merge